From 9ee1850177e32fa0bb07c2753103084ef3d5f4e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Glondu?= Date: Mon, 2 Mar 2026 08:10:09 +0100 Subject: [PATCH] Refresh patches --- ...-of-data-written-to-a-pipe-in-a-test.patch | 35 ------------------- ...for-linking-all-executables-and-shar.patch | 2 +- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 debian/patches/Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch diff --git a/debian/patches/Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch b/debian/patches/Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch deleted file mode 100644 index 716d605e..00000000 --- a/debian/patches/Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Stephen Dolan -Date: Mon, 30 Jun 2025 13:58:36 +0100 -Subject: Increase the amount of data written to a pipe in a test - -On some OSes, you need to write more than 1MB of data to a pipe -before writes block, and read more than 64k to unblock them. - -Bug-Debian: https://bugs.debian.org/1107773 -Origin: https://github.com/ocaml/ocaml/pull/14116 ---- - testsuite/tests/lib-channels/close_during_flush.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testsuite/tests/lib-channels/close_during_flush.ml b/testsuite/tests/lib-channels/close_during_flush.ml -index 39ef2fb..08e6f6e 100644 ---- a/testsuite/tests/lib-channels/close_during_flush.ml -+++ b/testsuite/tests/lib-channels/close_during_flush.ml -@@ -11,7 +11,7 @@ let () = - Unix.set_nonblock wr; - let buf = Bytes.make 1000 '!' in - begin match -- for i = 1 to 1000 do -+ for i = 1 to 10_000 do - ignore (Unix.write wr buf 0 1000) - done - with -@@ -25,7 +25,7 @@ let () = - output ch buf 0 1000; - let alarm_handler _ = - (* clear some space *) -- Unix.read rd (Bytes.make 10_000 '?') 0 10_000 |> ignore; -+ Unix.read rd (Bytes.make 100_000 '?') 0 100_000 |> ignore; - close_out ch - in - Sys.signal Sys.sigalrm (Signal_handle alarm_handler) |> ignore; diff --git a/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch b/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch index 620b9b49..90dbba92 100644 --- a/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch +++ b/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch @@ -16,7 +16,7 @@ Last-Update: <2021-12-21> 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index 0535f40..e7772b9 100644 +index 3754ad8..929b13e 100644 --- a/configure.ac +++ b/configure.ac @@ -1450,6 +1450,10 @@ AS_CASE([$target], diff --git a/debian/patches/series b/debian/patches/series index 43c3c3e8..21780bba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,5 @@ Trigger-output-complete-exe-on-custom-with-an-enviro.patch Do-not-error-on-warnings-in-autoconf.patch Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch Mark-test_compact_manydomains-as-multicore.patch -Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch Compile-utils-config.-cmi-cmx-with-opaque.patch Print-.cmi-flags-in-objinfo.patch -- 2.30.2